Ignore XF86WakeUp

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 30634f79b148c3bef85908ccfcb67c66061d4365..67774ed6b708fa67efd10413af94b930f5db0f9d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2013-12-30  Daniel Colascione  <dancol@dancol.org>
 
+       * term/x-win.el ([XF86WakeUp]): Ignore the XF86WakeUp key instead
+       of printing a useless when we resume from sleep.
+
        * progmodes/sh-script.el
        (sh-smie-sh-forward-token,sh-smie-rc-forward-token): Fix infloop
        in indentation code.  (Bug#16233)

diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 3c7373b6d6544f969cde8a9da466c373b18f07c5..424203c5c1df4d9255ff276266bb4df7b26e8ade 100644 (file)
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -1595,6 +1595,8 @@ This uses `icon-map-list' to map icon file names to stock icon names."
             (and value (cdr value))))
         x-gtk-stock-cache))))
 
+(global-set-key [XF86WakeUp] 'ignore)
+
 (provide 'x-win)
 
 ;;; x-win.el ends here